topology2: add SDW echo reference function topologies#10600
Open
bardliao wants to merge 7 commits intothesofproject:mainfrom
Open
topology2: add SDW echo reference function topologies#10600bardliao wants to merge 7 commits intothesofproject:mainfrom
bardliao wants to merge 7 commits intothesofproject:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adds new SoundWire echo reference “function topology” fragments (jack/speaker) and optional Loopback_Virtual DAI support, intended to be selectable as part of topology sets.
Changes:
- Add new SDCA generic build targets for amp/jack echo reference variants (including
*-ref-dai). - Refactor jack/amp generic configs to always provide module-copier tap points and move echo-ref pipelines/PCMs into dedicated
sdw-*-echo-ref.confincludes. - Update
cavs-sdw.confto conditionally include the new echo-ref fragments and to parameterize the Loopback_Virtual DAI pipeline index.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/topology/topology2/production/tplg-targets-sdca-generic.cmake | Adds new SDCA targets for echo reference and echo-ref-dai variants. |
| tools/topology/topology2/platform/intel/sdw-jack-generic.conf | Makes module-copier tap and routing unconditional for jack playback. |
| tools/topology/topology2/platform/intel/sdw-jack-echo-ref.conf | New jack echo reference capture pipeline + PCM definition. |
| tools/topology/topology2/platform/intel/sdw-amp-generic.conf | Makes module-copier tap and routing unconditional for speaker playback. |
| tools/topology/topology2/platform/intel/sdw-amp-echo-ref.conf | New speaker echo reference capture pipeline + PCM definition. |
| tools/topology/topology2/cavs-sdw.conf | Adds includes for new echo-ref fragments and adjusts Loopback_Virtual DAI index selection. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
|
@bardliao are the last 2 copilot comments still open or resolved, if resolved we can click the button. |
Collaborator
Author
They are resolved. The comments are duplicated between jack and amp topologies. |
Member
|
Some conflicts @bardliao |
This is a preparation commit for creating a stand alone echo reference topology. module-copier.1.12 is used by the echo reference, but it is harmless to create it and connect it to the no echo reference topology. And then we can connect the echo reference pipeline to module-copier.1.12 is echo reference is needed. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
This is a preparation commit for creating a stand alone echo reference topology. module-copier.1.22 is used by the echo reference, but it is harmless to create it and connect it to the no echo reference topology. And then we can connect the echo reference pipeline to module-copier.1.22 is echo reference is needed. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The spk echo refference pipeline ID 22 is the same as 2nd spk pipeline ID. Follow the convention that route and pipeline index start from pcm id * 10 to set it to 120. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The Loopback_Virtual DAI's pipeline ID should be either spk echo reference pipeline or jack echo reference pipeline. Use macro to select one of them. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Currently, we implement the echo reference pipeline, widgets, routes in the SoundWire config files. It is hard to create a stand alone echo reference topology for the function topology usages. This commit moves the echo reference part from the original config file and include the new echo reference in the original file. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
sdw-amp-echo-ref.conf and sdw-jack-echo-ref.conf are included in the sdw-amp-generic.conf and sdw-jack-generic.conf if needed. But for the function topology usages, we will create the jack/amp function topology and the corresponding echo reference topology separately. Move to cavs-sdw.conf allow us create he jack/amp function topology and the corresponding echo reference topology separately Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Add SoundWire echo reference function topologies. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
bardliao
force-pushed
the
topology2-echo-ref-alternative
branch
from
0b9fa7b to
69760f1
Compare
Collaborator
Author
fixed |
Collaborator
Author
|
Convert to draft as I see |
Collaborator
Author
Sorry, it was a false alarm. I tested with the original sof-sdca-jack-id0.tplg and sof-sdca-2amp-id2.tplg which don't have the module-copier for the echo reference topology to connect. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add SoundWire echo reference function topologies. Those topologies can be connected to the base SoundWire jack/amp function topologies. Those with
ref-daisuffix contain the Loopback_Virtual dai. The Loopback_Virtual dai should be created once and only once in the topology set. User can select the topology set by kernel module parameter.